Two steps forward, one step back.
Looks like my "electrician" isn't one afterall. He pulled in the service wiring, but didn't include a ground for the subpanel. Then he ran a wire from the frame to the neutral bus and said "building is grounded". At least the service wire is in a conduit, so...