Added back proper type-casting of integer and boolean types that was added in r419 and removed in r422. Fixes #321.
