Completely update regexes

This should completely fix #233.