A few small tweaks to my previous commit.