Repair FIRST across nullable prefixes — Code review | OneNoughtOne