Fixed syntax inconsistencies. Minor cleanup.
Fixed index path integer types.