Optimizations to -step and some removal of redundant calls