Modified loader/formatter to not be passed around.