Adjust two traps to co-exist

Turns out a pre-existing use of 'trap' in Anders' code stepped on the
trap I added. This coordinates, in a way that shouldn't break non-Google
builds.