Rearranged unit variables near command attribute.