Consistency with the bikeshedding in #21.