Various changes to make golint happier.