Tasks #0032 #0033: Review comment implementations.