Added the proposed changes from reviewed Pullreq.

Compiles cleanly now.