Merge "Yang parser refactoring."