freestyle and cycles?

i know that you can use freestyle together with cycles renders with the two scene workaround.

but are there any plans to support freestyle with cycles directly? i think cycles can be very nice for toon rendering too (with OSL shaders for example).

how tightly is freestyle integrated with BI? i fear it will be hard since freestyle needs a rasterizer and it took a very long time to get it working with BI if i remember correctly?