@rough-minister-58256: i've pushed my latest incantations here: https://github.com/pantsbuild/pants/pull/5167 ... feels like it is so, so very close.