fix vim-introduced whitespace error
replace another case of bad spec parsing with npa