fix envEnrichments to recognise catch assignee and nested assignments

also formatted it more consistently