D'oh! That was an obvious case to miss. Thanks for your optimisations, I'll look into combining these with fallintothis's.