More attemps to prevent let-floating and inlining