Fixed keyword parameter handling

@jurgenvinju, please review.