Move this below the "no callbacks?" `return` block?