improve REPLSystem parsing