Merge "Bug 1475: Correctly handle case of typedef that extends boolean"