Switch originalStmt type to Pair<?,?>. This should hopefully support stmts, instance declarations and method declarations.