Removed TODO Comment

Having those functions be macros would be more effort than its worth. Leave them as functions.