Minor code cleanup

Just some incidental style fixes, not directly related to my other changes.