Remove $(V1/2 ...) macros

Same as #254 but for D2.