Replaced macro with inline code.