Revert "Avoid calling idmap w/ trailing whitespace [2/2]"

This reverts commit a9270e76b54a61c4585f8746003c420653da731f.