Merge "Silent -wextra warnings"