Cleanup for handling single versions

The final push to including #293 in the public UI bits.