Cleaned up grouped callback code and made it so a grouped callback can
no longer be called immediately due to being triggered by another
grouped callback.