Change the lengths back to shorts.
Fix up callback signature.