The use of naked return values is frowned upon. This is the first of two bulk updates to remove them.