Refactor the HAWelcome extension.

Do not accept, please. I am just checking.