Update the definition of the riddle network to only pass proper list
structure into propagator macros, so register-diagram doesn't get
confused.
More compact command line.