Fixes #178. Well, more like 'makes it harder for good users to do the wrong thing'. True solution requires solution to #177.