Agreed that would be clearer. Lets merge these changes in with 0.9.0