(CPR-57) Fix style from recent rebase

This commit fixes the style problems introduced since pull request being
opened.