Remove the macros and update the code Reviewed-by: sspitsyn, cjplummer, amenkov
Reviewed-by: vlivanov, ihse, erikj, jcbeyler