More work on giving worlds multiple entry points.