Minor refactoring to help simulate Any as a class field