Addressed first round of feedback by @bnoordhuis