Improve InfoBlock to InfoBox conversions