Refs #382: Improve readability of regex