Compat warning in comment
Slight optimization