Minor changes to ContentsSensor.