Refactor prev_prop into prev-struct with a single member prop

This makes it more consistent across the "cur" and "next" structs.

Signed-off-by: Laslo Hunhold <dev@frign.de>