[FEATURE link-to-non-block] Non-block form link-to

Taking up the slack from #3264