Require set where it's needed. Fixes #808

@myronmarston - by your command.