Simplify double-join thing in shim
Mix in the 'onto' flag
All the... tests.. pass?