- Move declarations before statements in all blocks.
- Where 64-bit type is required, use it explicitly (not 1l).