Less constness

Fixes #64