Small improvements

It does set it to null, but the new commit doesn't call getCompoundDrawables any more.