some cleanups/fixes inspired by Jukka Salmi's feedback