Use new argument types
Defer lock loads until world load. Fixes #2