Reorder subs so they match call order