move Field expansion to the Expander

Move Field expansion, which is generic functionality, to the Expander
class as it adds no extra complexity to that class and simplifies the
Properties class further highlighting its policy instead of its
implementation.

Change-Id: I2e2594f3bf6acf112e4c6d74863fbc4f004b283a