Merge branch 'kj/pull-options-decl-cleanup'

Code clean-up. * kj/pull-options-decl-cleanup: pull: move options[] array into function scope