CPP: Cleaned up builtin macro handling.
Option: Option processing now checks for unrecognized options.