`kind' now more consistently an option