As far as I can tell all of these steps are just equivalent to using the qualified name. Add some tests which cover some of these cases, and remove the FIXME's.