Clean up mobile world insertion.

Removes some unnecessary duplication and coupling to Mobile.  This should fix #4758, but I wasn't able to reproduce that issue in the first place.