Slightly better regex.  Still getting substrings of handles though.