Move a couple of checks to JSCS.