Fix #204: add todo to reduce spans for code

This isn't a solution, but I'm going to leave a TODO for now.