Changed methods which returned false to return nil when nothing is found.