1. MVRBtreeRid  reformatting.
2. JDK 6 compatibility fix.