fix parsing of 'base' within imports (yet another FSM)
2 files changed