Gracefully handle cycles in parameters

Might close 632, pending more information.