vdukhovni authored Apr 19, 2021 and Marge Bot committed Apr 22, 2021

Also some code cleanup, and a fix for an (extant unrelated) missing
<pthread_np.h> include that should hopefully resolve a failure in the
FreeBSD CI build, since it is best to make sure that this MR actually
builds on FreeBSD systems other than mine.

Some unexpected metric changes on FreeBSD (perhaps because CI had been
failing for a while???):

Metric Decrease:
    T3064
    T5321Fun
    T5642
    T9020
    T12227
    T13253-spj
    T15164
    T18282
    WWRec

Metric Increase:
    haddock.compiler