Fixup changes from golint in base.
Updates for golint