More minor code reuse opportunities