Various bits of cleanup to get "bin/senet serve" running again in senet/.