Shuffling some code around to get the options working.
Shuffling options around to get arguments parsing correctly for docbook-gather.