 
 		# Get the definition of an entity type.
 		definition: (name) ->
-			name = (typeof name is "string") && name || name._type()
-
+			name = name._type?() || name
 			return @_context.entities[name]
 
 		# Find the relationship back to this entity, if it exists

		# Prepare a new transaction
		transaction: (spec) ->
			spec = spec || []

			return new JEFRi.Transaction(spec, @_store)

		# Return an interned entity from the local instance matching spec.

				else ""

		# Takes a "raw" context object and orders it into the internal _context
		# storage. Also builds constructors and prototypes for the context.
		_set_context = (context, protos) =>
			# Save the attributes
			_.extend @_context.attributes, context.attributes

			# Prepare each entity. Uses _.each to put (definition, type) in a closure.
			_.each context.entities, (definition, type) => # NO SERIOUSLY, definition MUST BE IN A CLOSURE!
				# Keep the definition locally, modifying it directly with the ctor and prototypes.
				@_context.entities[type] = definition
				# Ready the instances bucket
				@_instances[type] = {}

				# Build an entity's constructor.
				definition.Constructor = (proto) ->
