Converting Vanilla.World to use new component format. Small cleanups.