Fixes according to review (Thou shalt not return). See #3064