Better handling of ItemBlocks, BlockBase, etc.

Goes with my work on updating Oceania.