Completed byte order mark TODOs; consolidated other TODOs.