Small changes to appease vim-lint