oops I didn't realise the pull request would be for all commits, rather than cherry-picking just the ATOMIC_LLONG one (I'm still learning how github's interface works, sorry!)
I think I've emailed you previously about the other commits this will pull in.
I've done later commits to my fork too, fixing some incorrect index entries

Thanks Jonathan! I'm going to pull in all your changes as part of edits for the next draft - you got this in just in time :)