Clean up slicing for redundant indices in state space.

Fix #21
Merge branch 'issue21'

Address #21.