Mix around for E.Beef's (rather sensible) package changes