maze: mostly rewrites.