Cleaning up the ForceInline annotations to use their own data type.