Fix up some differences dealing with our older code.