#9631: Don't leave commented stuff hanging around