Slight refactoring of Interpreter class.