Enhance inf to follow spec.