Sounds reasonable. 

Because Github pastes everything onto a flat page, it makes reviews of this size hard. Thanks for bearing with me as I work my way through your changes.