Refactor prefix code
Work around a dumb nose bug
Reflow code