- Fixed 'pass by reference'-bug in the validation code and further simplified
  it.