Modifications to AliasDefinitionsFileBuilder in preparation for moving
all of the state into AliasDefinitionsFile.