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

This reverts commit f5a47b70139817c41aa52620131a96857e5f8c30.