Bump version and tidy handling of optional params