Attempting to adopt consistent style w.r.t. macro case separators.