Finishing up #5274 (widget paths fixes)

This is a continuation of #5274, which was blocking work on the docs.