Revert "omit some no-ops"

This reverts commit 4936161b98f59742aa9f01f3d98db17070527b33.