Fix various minor CodeNarc violations