Fewer changes is best. Not worth adapting it to a convention we want to migrate away from.