Merge "Appease the static analyzer"