Cleanup listeners a bit more. Also fix bug in recent dev builds where
placed blocks were not properly tracked.