make it actually work on filename read-in. Obviously, we need a macro to do it right.