Enable L1/L2 options to affect the call to optimization function

Results on pseudo_korean data seem reasonable, but more tests would be welcome.