@jtaylor-sfdc, with the null check in UpsertCompiler upsert no longer NPEs.  This test is now failing at this line, meaning this select does not return the expected single row.  Haven't had time to debug further.