Remove useless macro, use existing macro where it makes sense.