Fix for #58

This fixes the humanising-labels-when-not-necessary issue. It's not pretty, but I've tried to avoid changing any existing logic so as not to cause regressions.