Simplify step operator and associated types