"With some signatures simplified," we can close #295