Cleaned up reload_current(). Fixes #43.