FX My Life 3.4: It's a Trap!

OK, we're gonna add a trap this time, but before we start, we have to clean up last lesson's messes. We did a restructuring of the code, which was cool and (I don't think) particularly challenging, but hashnode gets very, very laggy to edit at a cert...