Going Beyond Heuristics by Imposing Policy Improvement as a Constraint