Updating to full map randomization, removing some unnecessary downcasts