Fixed some bugs related to analyse_runs

Fixed some bugs resulting from the updated options handling scheme.  This probably isn't the cleanest way to handle it but it works.