Mappings: Removed some duplicated code.
Improved type for sizeof().
mkpeep: Fixed several warnings.