LGTM. Maybe we should consider adding built-in support for --enable-.../--disable-... to our command-line class.