Fix log param numbering for @michaelnoonan
Pulled some of my changes from CustomSerializer into this branch.