Some more minor code cleanup (preparing for "official" Xonotic Git branch).