More lifting of TODO/FIXMEs from the source.