Improve join_p in various trivial ways