Made #216 to track and/or discuss further.