Skip some a needless temporary vec and clean indentation after #32