Sorting out layout when adding a declaration with no existing local delcaration