(my line of thinking here is that there's a lot of complexity within

build-support

and it would be good to simplify that some, if possible)