A couple of minor changes.
Testing prefixes and overzealotry in prefixing.