Update fixme markers and remove explicit UTF-8 encoding.