Fix unreached statement issues: t+