Changes due to s-ramp refactoring.