Simple parameters hide knowledge and ease testing. Change-Id: I9a8549199a1de07b437caf274c8d5e842183f570