d: po4a, reorganize a bit