Clean up macro madness

Change-Id: I353a161fdc274a3da5ac965df12379c0d65681a4