Improved snippet regexes