This patch revises the warning fix done in a93b1792. Specifically, it rolls the MRI.getType call into the assert, thereby avoiding the named variable.