Further cleanup of pg compiler options