Simplify. Also do not calculate double for macro+function