Better solution to the last commit

Don't even register the decorator if we aren't going to modify the
world.