Cleaned up class and property expression resolution for reasoner API