Yagnify the => form some, since we never actually use capturing groups.

Also, reduce code duplication in the non-=> form, by simply delegating
to the => form. Yes, it may result in a useless call to match:substring,
but oh well.