Just whitespace and comment.
Add some assertions to make sure we don't do anything whack.