Use constants arguments where possible

No functional changes.
Normalize "pawn in front of minor" patch

No functional change.
Merge remote-tracking branch 'upstream/master'