Forbid copy macro introduced.
Little code cleanup.