Refactoring due to changes in Spire.