Minor: avoid `.get`
Unit tests for #619