Dependency expressions parsing fixes