Merge "Rewrite mterp field access helpers"