The issue that required sometimes not using DIBuilder here was fixed in the
previous commit.