More improvements to unrecheable code