Some tidying around step exporters