Remove "All" from the tree navigation functions and add "Primary" to the Device->Service getters.

Fixes #40 and #41.