remove some uses of @record and use record argument