[PATCH 00/18] More pesto preliminaries