Merge "Remove redundant type specifiers"