make parameter handling a bit more future-proof