Changes per feedback from @BanzaiMan on #202