Refactored code in preparation for request/command option support.