Changed type signature of some StrategyTable methods. Modified Element
interface so that elements can specify whether they are decorated or
not, and return undecorated versions of themselves.