* Reduced some pointless regex capture overhead