Fixed incorrect spaces in macro expansion. Consistently use a _ prefix for macro arguments.