Follow-up commit for NP-7 following code review comments.