Changes toward adding multiple outputs, removing patterns, and allowing explicit lustre.