Sema: Minor const fixups and control flow tidying.

No functionality change.