More link form improvements

From #2197.

Also, the fix for #2485.