Follow up on #238

Some additional code review can be found in #238