Whoops, I almost made it TOO secure. :) Sorry about the last-minute commit,
but it was necessary as I was mangling the href-links which we shouldn't really
do. Sometimes they are actually useful. :)