Merge "Remove a redundant self argument in decorators"