Cleanup: discard initial assumption about compile-time usage of algorithm constants