Updated code to eliminate implicit coercions #418.