Nitpicked changes from code review :P