Minor changes to support overridability, eventually to be used by CSV module