Adding support for before/after(:step) 

Refs #14