Make a stab at merging in changes from https://github.com/stepcode/stepcode/pull/192, needed for select_lookup_enum.exp