Avoid needless array creation here
Don't need the object extinguisher any more
Fix build script