Convert more 'setup do' to 'def setup' for consistency