Tweak Dirk's changes to get things passing again.