Favicon code tidy up.