I got a call from FotoVideo saying I could pick up my D40 today. It has been in repair for exactly a month.
There was no documentation about what had been done with the camera, but the built-in flash worked, so that was obviously fixed.
I had a look at the Sigma 30mm f/1.4, which feels like a sweet piece of glass. I’m planning on buying it as soon as summer’s over.