Tweaks to !1199
(Opened an MR to fix nits by myself, so as to lower feedback turnaroud, and to give myself the impression of coding :))
(Opened an MR to fix nits by myself, so as to lower feedback turnaroud, and to give myself the impression of coding :))