Some clean up; add FIXME note on blank node relabeling.