This looks good now.

By the way, you could run ./check-license-headers.sh to verify all files have the header.