added more configurations for PRVO; fixed a NullPointerException on PMD