Touchups

Does `undefined` case matter here?