This somehow got lost.
Move Override stuff before part restriction stuff to fix restriction comparisons. #10