Fix return value of wrapper function.

Also add package classifiers.