Avoid using postfix operators

This fixes some warnings and avoid future issues with postfix operators.