Sync up with qgnus-0.33.