addClause() is almost ready for the new default-override mechanism