Adding back in no-else-return rule.