Corrected CLD macro to allow several storage backends of same type.