Minor cleanups. Refactored assertions for object and map.
Minor cleanups. Refactored assertions for object and map.

sebastian-software/core,zynga/core,sebastian-software/core,zynga/core,zynga/core,sebastian-software/core