Switch to /x option in regexp of macro defining step
Shorten comment in extended regular expression