Minor macro improvement.