Enable building with open-source BSC. Resolve a couple issues brought up by Jess. Remove a stray space (as noted by Jess).