Remove the early development stage's garbage and Add C macro for
convenience.