Make mphandlers go-lint compliant