Build improvements

[rpavlik]

This is work to try to fix the fact that consumers appear to be trying to use debug dependencies even when they're not supposed to.

[godbyk]

This looks good to me on the first read-through.