Suspicious instanceOf test change; updated after discussion