'standardizing' awful macro usage