fix interpreter to be a little more orthodox.