Massive refactor of callbacks; turned inline registration into a @Callback tag