Steve,
You are correct about the return of the gun. I have an FFL and all the goodies for CA law. I thought the law was vague. I recently had a federal audit. I had a real good guy so we discussed many thinks I was unsure of. I suggested that the gun is still the original owners gun until the inspection period is over. He told me that he understood my argument, but that is not what the law says. The gun must be shipped (returned) to an FFL.
We also discussed consignment guns and a consignment gun if not sold , by law, needs to be processed like a sale back to the original owner. Not a big deal in other states, but here in CA it means $25 and a 10 day wait. If the owner cannot clear, then the gun cannot be return and it become a $ mess.
Jerry