Fixed on the name_handling branch, but it's not easily disentangled from other changes on that (not fully functional) branch. Will come whenever that's merged back in.