Made agfs use the new ambiguation code.