I merged the variable and type addition commits.
I believe I wrote the commit messages such that all linked issues are now closed.
Any other minor changes along these lines we want to add now?
On the intext PR, I had to do some git surgery to fix it. Can you two take another look?