Make some more division stuff optional.