Merge in class fixes from --pgweb.