Cosmetic tweaks
Prototype flexible geometry-generator interface