Weave.toCode improved.