shapes.scad: refactor