More moves towards items in mapgen_spec. Fixed a compile warning.