Fix macros for dimensionless numbers