Small refactor of setOptions to allow extension, refs #413