Combine two begin/end blocks; drop some comments
Introduce FilenameError as internal error class