the prototype of full swizzle support; some cleanup