Handle keyword aliases straight ahead in IRI expansion
Remove unnecessary nesting in IRI expansion algorithm