Simplify constants and treasure location.