Revert "New parseOpts implementation. Needs cleanup."

Pushed to the wrong repo. Sorry.

This reverts commit 0b2fbdf8f35e6a3a457aeed8164bdc0ecd2881b5.