language changes: ToStr -> ToString, Index changes, macro hygiene fixes