Fairly substantial rewrite; get rid of some hints that are doubtful / have little interest from browsers. More to come?