tweaks: put some case labels closer to their statements

Also condense some comments, and group keys with the same result together.
1 file changed