#54 Improve handling of boxed types