Fixes to prefix mechanism; now a classy prototype.