Replaced various macros.