GATEWAY-3381: Comments and cleanup.