I think some of this got better in 0.5 (so maybe no need to rely on internals later, fine now though i think).