Plan B

Leo's perspective: convert all _add_ to __add at "compile time".