Fixed issues with typeid and typeof.