Standardize usage of "@return self"