@mistydemeo thanks for your input!

I just pushed a commit with both issues linked.