Small changes to the disambiguation filters to work with the new AST format.