Rename the .impl property and ensure all files use unwrap as needed

This is in preparation of allowing different strategies for wrapping