Improve code clarity by removing two unattractive macros.
1 file changed