Fixes broken span statement.

Adds a proper class and closer.