issue/415 complexity reductions (thanks to vecna suggestions)