CLEANUP: Fix various golint issues.