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

This reverts commit 5c357a82e9d28f65224bb82699baf52462c4ffc7.