GCW-Zero polishing

Fixes #292.