The re-factor to put it in the `ArakawaC` superclass solves both problems. :smile: