Improve code clarity by removing two unattractive macros.