no-upstream: purely local changes

These changes should not be upstreamed; they are purely local changes
for convenience in testing and developing Capsicum.