I just noticed that this patch breaks SLIME, so it definitely needs more work around the corner cases. -- "A screaming comes across the sky. It has happened before, but there is nothing to compare to it now."