Renamed ExecOption parameter to match type, other cleanup