Added block context to all required code paths.