Fix origin declaration style on cloning when values are prefixed