Merge "dx: Minor code clean-up"