Issue #25: more TODOs