Some cleanups (~36 p on Kattis).