Bring FetchStruct in line

Closes #25.