Switching to respect ID behavior.

Towards #435