Various cosmetic fixes and improvements (trivial).