Add hacky way to distinguish named and named sections. This will be generalized in...