BREAKING CHANGE - Better decorator argument parsing

This fixes #810