HPCC-9549 Library cannot be resolved unless uses same package as query

Cleanup following code review

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>