Remove a ton of 'return ()', and a few other minor readability tweaks.