Remove unneeded macro.
more minor perf things.