Minor simplifications with ExtCore.
Added some OPTIMIZE comments.