Tidy up the path management macros.

Change-Id: I6db538b492f4c20768be122106d1d38190ae09f5
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>