reorganise option decls in anticipation of great new features
whoops - spoling mistaik
simple cleanups before a unit of work