Cleanup for #374 resolution

No return needed.