Simplified the instance declarations.