More progress on Org-ified init files.