Small computational speed bonus

(but maybe the compiler elides all the copies anyhow)

Some more testing is needed, but looks promising so far

Also not clear if this is the best way to include it.  Probably need the std::variant approach here too.

Python compilation working again