More function rejigging.