Fix ndefPush mapping, code rearranging.