Misc. updates in response to bulk messaging pull request comments