version 0.5.0-pre.6: use non-capturing parentheses, simplify the code