Clarify a TODO comment.
Fold getPaths back into NewAPI.
Move machineID onto API.