Get new selftest (from db32edaf6) to actually compile.  (Sheesh)