Another regex tightening which will finally allow me to differentiate set vs. get
This commit also removes U (ungreedy) modifier as I'm setting greedy patters in the regex itself now