BUG-981: drop use of deprecated interfaces

This is a follow-up migrating to new constructors.

Change-Id: Ib76ff216e52c7142fd822b4e7e0b5004e5d54915
Signed-off-by: Robert Varga <rovarga@cisco.com>