[ENSCORESW-969] [ENSCORESW-901] Massive pedantry commit.