minor optimization (cuts bench from 0.20 to 0.16)
add a test for honoring lazy params