Here, most cleanups applied, retested: http://cr.openjdk.java.net/~drchase/8002160/webrev.02/ In particular -- one call to kind_field(), changed type of temporary to OprKind, added comment, removed now-unnecessary braces so indentation/bracing no longer an issue. David