replace bespoke collection Buildables with a single one that uses the CanBuildFrom machinery