Use suitable types for variables.
Merge pull request #988 from monaka/pr-use-suitable-types-20130312

Use suitable types for variables.