Cleanups: reduced inlines, place 'let' hooks in seperate header