Refactor equivalent? to be a little less onerous.
Minor refactor of SCP regexp matching