Merge "Revert "Revert "Optimizing: Better invoke-static/-direct dispatch."""