Added back inlines, default preprocessor flags for DEBUG.