The last minor change to use it also standalone.