Some cleanup of Function interfaces,
Fix a bad UTFF16 checkin in sample data