Use narrower return type?