Removed incorrect assertions, closes #515
Fixed a glitch in keyword parameter handling