Remove some assumptions of 16-bit internal storage