Fix up some inconsistencies.