Merge "dx: Remove a couple of hotspots"