You're right, that is a left-over from my first round of trying to fix the problem. The actual fix was to use guards.