Drop the extra level of nesting?