Merge "Remove constant conditionals (dead-code)."