Tidy up. One more return type mismatch fix.