Make more stuff explicit