Follow up to !80 (merged) comments:
!80 (comment 237121698)
!80 (comment 237121699)
Closes #62 (closed)