Use data_get().

Signed-off-by: crynobone <crynobone@gmail.com>
Simplify to use array_except()

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Merge branch '2.2'