Merge "Minor improvement on static BCE analysis."