Make the compact version make more sense
Strip out plus signs when restoring comment
Add a clear/abstain choice