Generic defaults

See individual commits.