Lots of JVM un-skips/un-todos from today's fixes.