Fix duplicate return statement on simple templates