union-1016578: Review fixes

Signed-off-by: Joe Walker <jwalker@mozilla.com>