Tighten up partial functions a wee bit.