Full review (do not merge)

Good catch!