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