Merge "Remove stray end of macro."