Mocking fixes.  New strict mode basically works, now.