Merge "Make OatClass and OatMethod immutable once more."