Improve XXX regex.