Fix #1000. Fire NOT_COLLIDING on removal if colliding.
Merge pull request #1316 from kwhatmough/next

Fix #1000. Fire NOT_COLLIDING on removal if colliding.