Modifications to AliasesFileBuilder in preparation for moving all of the
state into AliasesFile.