Fix const type issue.
Unified integer types.