Linearize dependencies; prep for commonplace