Added returns where missing.