Minor cleanups
Rejig how subpath is specified for table macros