Delimiter-Aware RegEx in Attributes

Use a delimiter-aware RegEx when creating attributes to avoid broad and
accidental matching of steps, which can occur with the default (.*)
RegEx.