Several more changes for Brewfile.