issue 11345 is fixed in r24861

yeaah!  there are a few more TODOs that we can address now with this...