Some work on getting SnowStorm to compile again.