Implement better arrows. Fixes #21