Added some TODO markers about unexpected (superflous?) calls.