Add type signatures to avoid type class defaults