Revert "Update match.r"

This reverts commit 55c0d7cb1047c23c9018e855f150f1089c32d6d2.
Revert "Update pad-trim.r"

This reverts commit b16a38d3954861faf24568dad0e85e156d58becc.