Use an object in TODO blocks instead of a String.

Ehh, I'm not sure if this is actually better?