Move my TODO comment on HEAD_SIZE to issue #2