semantic sugar -- make leading comments match standard style, minor function
shuffling.