Cleaned up macro definitions and default value declarations.

Signed-off-by: Chris Bell <cwbell@mail.usf.edu>