Same thing for this if - you should be able to just have if (!baseType.isFixedWidth())