Marking assembly CLS compliant; fixes #499