VID-269 Eliminate perlism, better object checking