Unify some basic infrastructure.