Improved descriptors -- removed redundant reflection checks and moved
them to a better place