More rust-like corrections (mostly useless returns)