generalize commonplace deployments (bug 904233)