S3 method consistency fixes.