Fixes for broken nightly tests around JS CA

I broke a couple tests in the nightly integration suite for JS CA. These are quick HACKY fixes for those.

The general problem is that right now I'm using simple heuristics for determining if we're referring to a type or an instance of a type for CA. These are updated to work for our tests and most common usage, but the ideal is to actually track back an identifier to it's last assignment/definition to determine if we're referring to a type that as set up as a constructor function, or a type that was defined using an object literal (where the type and var name are the sane,, but the var actually refers to an instance of that type).
I would extracted this common code into a method, will help in case if we need add any additional params in the future.