Back out optimize_isconcrete; it breaks something.