Refactored setting of completion policy to not overwrite JSR defaults