refactor constraint helpers to use common method signatures