Removed Template Parameter

Merged the state and flux index template parameters into a single
parameter. It was decided that maintaining two separate indexes
introduced too much overhead.