Additional changes and additions for Spire compatibility.

These were added during the porting effort for Spire.
Mostly they end up standardizing what was already there.