Some minor cleanup.
Removed end-dream-on-world-change for now.