cleaned up SQLFromParser.