Minor refactoring. Added matrix type to uniform state spec.