Fix type references in Javadoc. Change lambdas to method references where applicable. Original Pull Request: #529