Fixing more reprint-from errors.