Minor updates to conform to latest PSI4 (12/26.2014).