Less is more: Removed `lazy` switch