Fix some assumptions on lazy enlistment boundaries