Clean up Container.update a bit
Rearrange things in gui.moon