fix omission of cmd tokens that resolve as nil