Remove introduced bug from previous changes that prevent empty tools from being populated.
Cosmetic refactoring in AOM_PROFILE classes.