cleaned up trap handling in Interpreter.java