Code changes that will allow the latest baucis-swagger plugin to work

This is in conjunction to this pull request...
https://github.com/wprl/baucis-swagger/pull/15