Move ad-hoc CodeUnit properties into .data object