Removed generics from EntityExpression and EntityType, added line and column ints to improve debugging