/text/states: small code cleanup
lib: use common blocks instead of additional arguments in integrands