Two minor improvements to `phi`