Full review (do not merge)

Fixed in 80f96e41b.