Some TODOs removed. #89.