Still trying to make commit-time validation pseudo-code compliant