Remove even more redundancy in endgame functions handling