Simpler handling of prefixes + cosmetic.