Merge "collation: Use `self` to reference same class instead of class name"