Tested the patch. Applies cleanly and addresses the concerns in #35. Would b...