Objectives fine-tuning

This PR is a response to the latest comments in #6377, and should facilitate the requested changes.