Intern conversion updates, 8/12/14

Supersedes #54, #55, #71, and #72, which have been reviewed and incorporated on this branch.