I've made the suggested changes. Please find attached an updated patch.