Fix alignment, remove more broken \_ references.