Some small design fixes and ordering stuff

`default_scope` expects a block as its sole argument.