Make natural_key functions return a tuple. Fixes #16