Removed some macro usage that is no longer needed.