Code tidy up from pull request #737.

Tidied up the code from pull request #737.  Removed duplicate code in
the 5 attributes that dealt with the HTML Redirects.