This will make it easier to support options in common between different
encoders.  It also cleans up some of the field naming.