Reduce namespace pollution, remove obsolete interpreter checks
More concise lookup table construction