Patch that implements my suggested changes.
This file cannot be previewed. Try downloading the file instead.
