improve annotation regexes