Command line option for showing context. Also streamlined command line switches.