Address review comments.

    - Rename 'preferredOnly' to 'usePreferredOnly'.
    - Get rid of 'firstOnly' altogether.
    - Fix tests.