Cruft that could be fixed; waiting for any other comments.