Time for my semi-random code cleanup commit.