Simplified type checking, added () to macro