Non feature branches

A better name for the block argument seems "configuration".