I agree, i'll extract all lazy code into a separate module then.