Sort out saddle/mountain_pass

Fixes #72