Rearranged code to run commit constraints before all commit validation, part 2